Merge from emacs-24; up to r107933
authorGlenn Morris <rgm@gnu.org>
Wed, 2 May 2012 07:20:29 +0000 (00:20 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 2 May 2012 07:20:29 +0000 (00:20 -0700)
commit2e277c655e8710e244b8774e5fde93c8b67b6577
tree9d184c12b384a3d0cd4b60ff72ee4e1ce8911892
parent7f72ba10fdec05b2c3b5014c3ebf5ab63b86dd20
parent3c349c3fa70cea927e24da42304686fe0b8e0bfe
Merge from emacs-24; up to r107933
17 files changed:
ChangeLog
Makefile.in
configure.in
doc/emacs/ChangeLog
doc/lispintro/ChangeLog
doc/lispref/ChangeLog
doc/lispref/files.texi
doc/lispref/intro.texi
doc/lispref/loading.texi
doc/lispref/package.texi
doc/lispref/text.texi
doc/misc/ChangeLog
lisp/ChangeLog
lisp/mail/rmail.el
lisp/window.el
src/ChangeLog
src/xdisp.c